From: Jasper St. Pierre <jstpierre@mecheye.net>
Date: Thu, 26 Sep 2013 20:20:06 +0000 (-0400)
Subject: Revert "overviewControls: Don't allow appearing controls to "pop in""
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~3324
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=508a511d2a4ad4b2b545f7ae5c5a7fafd50afef0;p=gnome-shell.git

Revert "overviewControls: Don't allow appearing controls to "pop in""

This reverts commit e31693bbeea706bc646298d935e5e55e9ef01565.

This doesn't properly adjust the allocation, leading to an unbalanced
overview where things aren't centered properly. Just revert for now,
and we'll rethink this next cycle.
---

diff --git a/js/ui/overviewControls.js b/js/ui/overviewControls.js
index f5314762e..c16c4ac54 100644
--- a/js/ui/overviewControls.js
+++ b/js/ui/overviewControls.js
@@ -208,12 +208,23 @@ const SlidingControl = new Lang.Class({
     slideIn: function() {
         this.visible = true;
         this._updateTranslation();
+        // we will update slideX and the translation from pageEmpty
     },
 
     slideOut: function() {
         this.visible = false;
         this._updateTranslation();
+        // we will update slideX from pageEmpty
     },
+
+    pageEmpty: function() {
+        // When pageEmpty is received, there's no visible view in the
+        // selector; this means we can now safely set the full slide for
+        // the next page, since slideIn or slideOut might have been called,
+        // changing the visiblity
+        this.layout.slideX = this.getSlide();
+        this._updateTranslation();
+    }
 });
 
 const ThumbnailsSlider = new Lang.Class({
@@ -589,14 +600,18 @@ const ControlsManager = new Lang.Class({
             return;
 
         let activePage = this.viewSelector.getActivePage();
-
         let dashVisible = (activePage == ViewSelector.ViewPage.WINDOWS ||
                            activePage == ViewSelector.ViewPage.APPS);
-        if (!dashVisible)
+        let thumbnailsVisible = (activePage == ViewSelector.ViewPage.WINDOWS);
+
+        if (dashVisible)
+            this._dashSlider.slideIn();
+        else
             this._dashSlider.slideOut();
 
-        let thumbnailsVisible = (activePage == ViewSelector.ViewPage.WINDOWS);
-        if (!thumbnailsVisible)
+        if (thumbnailsVisible)
+            this._thumbnailsSlider.slideIn();
+        else
             this._thumbnailsSlider.slideOut();
     },
 
@@ -609,16 +624,8 @@ const ControlsManager = new Lang.Class({
     },
 
     _onPageEmpty: function() {
-        let activePage = this.viewSelector.getActivePage();
-
-        let dashVisible = (activePage == ViewSelector.ViewPage.WINDOWS ||
-                           activePage == ViewSelector.ViewPage.APPS);
-        if (dashVisible)
-            this._dashSlider.slideIn();
-
-        let thumbnailsVisible = (activePage == ViewSelector.ViewPage.WINDOWS);
-        if (thumbnailsVisible)
-            this._thumbnailsSlider.slideIn();
+        this._dashSlider.pageEmpty();
+        this._thumbnailsSlider.pageEmpty();
 
         this._updateSpacerVisibility();
     }